Merge branch 'master' of https://github.com/Datamine/Set-Trainer

Conflicts:
	README.md
	index.html

done
asdf