Merge branch 'master' of https://github.com/yudasinal/alarmapp into cleverrainbow
User Login and Registration complete
Merge branch 'cleverrainbow'