update
Merge branch 'master' of https://github.com/chrisgreeff/app4ir-presentation

Conflicts:
	css/theme/default.css
	index.html