New Stuff
Merge branch 'master' of github.com:earasoft/COSC578DatabaseProject

Conflicts:
	app/models.py