MCR Aaron
manual merge with aaron's stuff.
Still need Layer## images to run. ..
Unit Tests with full coverage for UserProfile.java
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
Logic.java is nearly fully covered with Unit tests through
LogitTest.java
Full comprehensive coverage on Game.java via GameTest.java
Fixed HomeView to have candle images .. need centralized text.. will
implement tomorrow.