It was the best of times, it was the worst of times
Merge branch 'master' of github.com:Brainshots/AlarconApp