NOW I AM BECOME DEATH, DESTROYER OF WORLDS
Merge https://github.com/gerisc01/finholt-senior-project

Conflicts:
	web2py/applications/SeniorProject/controllers/default.py
	web2py/applications/SeniorProject/views/default/createproject.html
	web2py/httpserver.log