sdl2 changes
Merge branch 'master' of https://github.com/per-nyberg/work.git

Conflicts:
	SDLTest/src/Main2.cpp