Worked on tests with Mike
Created splash screen v1.0
Added test for history, tests now pass

Didn't implement parseResponse: currently ResponseParser assumes it is
passed a valid JSON string.
Merge branch 'splashscreen' into develop
Created Main Menu of App
Merge branch 'mainmenu' into develop

Conflicts:
	SolarPanelApp/res/values/strings.xml
Merge branch 'bluetoothmock' into develop

Conflicts:
	SolarPanelApp/src/com/example/solarpanelmanager/MainActivity.java
Fixed missing newline issue with mock panel
Changed snapshot to use unix timestamps. Messages should actually change things now.