more databaseAccess drafting
Merge branch 'master' of https://github.com/BrainTrainSite/BrainTrain

Conflicts:
	src/braintrain/User.java