Small Update
Merge branch 'master' of https://github.com/davidamin/CS3240Project

Conflicts:
	Flask/server.py