Merge branch 'master' of https://github.com/arunjit/taboo-app
Add some structure
fix headers