styles
added mock bed
carousel boom
solved merge conflict
Routes with token
Merge branch 'develop' of github.com:ianyang/bundle into develop
in place
put in comments for loading
Merge branch 'develop'
Merge branch 'master' of github.com:ianyang/bundle