button change
Merge branch 'master' of https://github.com/sinclarius/TEFC

Conflicts:
	all.html