styles
Merge branch 'master' of github.com:whostolemyhat/bookshelf

Conflicts:
	index.html
	js/app.js