Adding some styling using Bootstrap
Styling
fixed merge conflict
Merge branch 'development'
Merge branch 'master' of github.com:HanWax/latergram