heroku push
alsdkf
asdkfj
Merge branch 'master' of https://github.com/namespacestd/devfest_mmaa

Conflicts:
	devfest/settings.py