[Insert your commit message here. Be sure to make it descriptive.]
Merge branch 'master' of github.com:Brainshots/AlarconApp