Initial Commit
String addition
Layout color
Merge branch 'master' of
github.com:benklett/android_app_calculator

Conflicts:
	.gitignore