mod views
Merge branch 'master' of https://github.com/BluInc/YaleHack
Merge branch 'master' of https://github.com/BluInc/YaleHack
final commit
added stuff
Merge branch 'master' of https://github.com/BluInc/YaleHack

Conflicts:
	vsee/vsee/settings.pyc