My wife majored in Kinesiology and got her masters with a focus on math. It's not so much important what your undergrad is in if you're going to get your teaching credential and masters in the same subject. If you like civil engineering and may want to do that in the future, do that because you'll need a teaching credential in most states anyways. If you want to jump to the next pay scale, you'll need a masters after that.