new look for app
fix conflict
Merge branch 'master' of https://github.com/sam3k/twoogolate