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'
I swore this was already fixed?
Add stepup to INSTALLED_APPS so it actually does stuff
s/permalink/models.permalink/g, add organization fields
Change admin.py to use correct field
s/permalink/models.permalink/g, add organization fields
Merge branch 'creffett'

Conflicts:
	hackathon/stepup/models.py