refactor
A big refactor
Merge branch 'refactor'

Conflicts:
	index.html