fix comment error in database
Merge branch 'master' of
ssh://git@github.com/RobertMcDermot/CS1530Project.git

Conflicts:
	ClassWeb/.gwt/.gwt-log
	ClassWeb/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml