urls (hopefully) corrected, probably not tho
Merge branch 'master' of https://github.com/dcoombs2/boozit

Conflicts:
	boozit/urls.py