activation stuff
Merge branch 'master' of https://github.com/Eythorio/random-experience

Conflicts:
	test.html