About to go HAM on views shit
Merge branch 'master' of https://github.com/tatemandel/Queueueuebble

Conflicts:
	queueuebble/queue/views.py