More info
Merge branch 'master' into refactor

Conflicts:
	HUGE UPDATE INCOMING.txt