Initial commit
Added LICENSE file
Testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	SunAlarm/src/main/res/values/colors.xml