This is the first commit of the overall app
Merge branch 'master' of https://github.com/shalomabitan/TrollApp