MERGE
Merge branch 'CarlH' into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj
	Breakout/Breakout/Breakout.vcxproj.filters
	Breakout/Breakout/Storage/FileManager.h