master stand
some changes
bla
Merge branch 'kevin'

Conflicts:
	css/style.css
	js/bookFunctions.js
	js/uiFunctions.js