premerge
styles updated
git push origin masterMerge branch 'master' of github.com:JumpStartGeorgia/Soldiers