presentation and about text
Merge branch 'master' of https://github.com/Bookshow/bookshow.github.io

Conflicts:
	presentation.html