setttings folder didn't add
Merge branch 'master' of https://github.com/jrouly/srct-vahack
Merge branch 'master' of https://github.com/jrouly/srct-vahack
moved ordering on models, fixed indentation
Merge branch 'master' of https://github.com/jrouly/srct-vahack

wasn't on my branch; sorry
s/volunteer/settings/g
Merge branch 'creffett'