now able to auto-login directly to home page when starting app
fixing merge conflicts
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git

Conflicts:
	CS496_Project_Persistence/src/edu/ycp/cs496/eduapp/model/persist/DerbyDatabase.java
	CS496_Project_Persistence/src/edu/ycp/cs496/eduapp/model/persist/IDatabase.java