initial android commit
Merge branch 'master' of https://github.com/Doolan/WildHacks2014