Adding android app
Merge branch 'master' of https://github.com/jmaguire/Hackathon