c&p fail
Merge branch 'master' of github.com:Brainshots/AlarconApp