merge
Merge branch 'master' of https://github.com/imichaelnorris/hackumbc

Conflicts:
	modeler/server.py
form
Merge branch 'master' of https://github.com/imichaelnorris/hackumbc