initial
git commit
Merge branch 'master' of https://github.com/PaddyBadger/TheBiggestSaver

Conflicts:
	.idea/.name
	.idea/libraries/support_v4_21_0_0_rc1.xml
	.idea/misc.xml
	.idea/modules.xml
	mobile/build.gradle
	mobile/mobile.iml
	mobile/proguard-rules.pro
	mobile/src/main/AndroidManifest.xml
	mobile/src/main/res/values-v21/styles.xml
	mobile/src/main/res/values/strings.xml
	mobile/src/main/res/values/styles.xml
	wear/build.gradle
	wear/proguard-rules.pro
	wear/src/main/AndroidManifest.xml
	wear/src/main/res/drawable-xhdpi/ic_launcher.png
	wear/src/main/res/values/strings.xml
	wear/wear.iml
Merge remote-tracking branch 'origin/master'