Haven't done much but want to pull
merging
Merge branch 'master' of https://github.com/BrainTrainSite/BrainTrain

Conflicts:
	build/classes/account/AccountManagerTests.class
	build/classes/account/CreateServlet.class
	build/classes/account/LoginServlet.class
	build/classes/braintrain/User.class
Index still homepage
Updated Homepage and index.jsp