C
Merge branch 'master' of https://github.com/sada-narayanappa/SCHAndroid

Conflicts:
	SCHAS/.idea/misc.xml
	SCHAS/app/app.iml