making a page for presentation
Changed demo a little
Merge branch 'gh-pages'

Conflicts:
	index.html
	script/app.js
	style/style.css
changed thins that i fucked up during the merge
bla