sbth
sbth
sbth
Merge branch 'master' of https://github.com/capitalsigma/battlehack-chicago

Conflicts:
	service/views.py
up
up
fixing login
using ours