Fixed global issues

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Merge remote-tracking branch 'remotes/origin/Input'

Conflicts:
	MartinPeterSDL.suo
	MartinPeterSDL/MartinPeterSDL.vcxproj
Solved conflicts

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Merge remote-tracking branch 'remotes/origin/master' into Input

Conflicts:
	MartinPeterSDL.suo