merge
Merge branch 'master' of github.com:patrickw14/hackathon

Conflicts:
	hackathon/hackathon/urls.py
Merge branch 'master' of github.com:patrickw14/hackathon