Committing urls for merge
Committing urls for merge
Merge branch 'master' of https://github.com/daubers/HackDoorMenu

Conflicts:
	HackDoorMenu/urls.py
Vagrant running nicely