fixed positioning
Merge branch 'positioning'
Merge branch 'master' into gh-pages

Conflicts:
	index.html