manual merge with aaron's stuff.
Still need Layer## images to run. ..
Had to use workaround to get uniqueUser to work since because Derby
doesn't support many things for SQL.  Also commented out FakeDatabase
completely since it's not being used anymore.
Merge remote-tracking branch 'nlay/master'
Full Comprehensive Coverage for User.java through UserTest.java
Unit Test complete for Battle.java through BattleTest.java