Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	HackDuke/HackDuke.v12.suo