some refactoring
Merge branch 'master' of https://github.com/israellevin/tavili

Conflicts:
	index.html