Input updated

Signed-off-by: Martin Grönlund <martingronlund@live.se>
Merge remote-tracking branch 'remotes/origin/master' into Input

Conflicts:
	MartinPeterSDL.suo
Merge remote-tracking branch 'remotes/origin/Input'
aasdasd

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Added stuffs

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
asdads

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>