Small change to main
Added unit testing and fixed bug

Added unit testing for server, but version 1.0
Still needs to finish unit testing.

Fix the bug that add user and check login not working.
The problem was as result of the password encryption.
Merge branch 'OAuth-Login' into User-Interface

Conflicts:
	CorpseSlasher/nbproject/project.properties
	CorpseSlasher/src/CorpseSlasher/Main.java
Updated changes to gui and server intergrations
Did testing on GUI server integration
Found a bug in oauth

The oauth google+ not working.
The problem is getting the authentication token is not working anymore.
Commented it out so google login work for now. Need to fix the bug
Testing the retrieve password function, bug needs to be fixed
Fixed bug and added project.properties in server

Fix bug in retrieve password caused by the password encryption.
And added the project properties file to make the server work.
Testing on login complete working on settings now
Finished off all testing with merging of GUI and Server, display settings still not put back in, still bug issues to solve, can be merged to current master
Merge branch 'User-Interface'

Conflicts:
	CorpseSlasher/src/CorpseSlasher/Main.java
	CorpseSlasherServer/nbproject/project.properties