Herpderp, shoulda check if it does really compile.
Merge branch 'master' of github.com:Brainshots/AlarconApp