front end stuff
jdfkl
jfkdMerge branch 'master' of https://github.com/cswanso2/hungerhunt

Conflicts:
	db.sqlite3
	hunger/migrations/0001_initial.pyc
	hunger/migrations/0002_auto_20141203_0334.pyc
	hunger/migrations/0003_auto_20141203_0502.pyc
	hunger/migrations/__init__.pyc
	hunger/views.pyc
	hungerhunt/urls.pyc
	template/index.html