Stripped down to barebones
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreateTest/main.js