Bugfix, v1.1 for production
Merge branch 'master' into r2_index

Conflicts:
	index.html
Added notes, completed coding