Update!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Krunch/Assets/TestScene.unity
	Krunch/Krunch.userprefs