14:26
Merge branch 'master' into Dev
16:06
Merge branch 'master' into Dev

Conflicts:
	RobotSplit/RobotSplit/TextureManager.cpp
17:44
Merge branch 'master' into Dev
18:41
Merge branch 'master' into Dev

Conflicts:
	RobotSplit/RobotSplit/Main.cpp
	RobotSplit/RobotSplit/TextureManager.cpp
21:47
10:35
Merge branch 'master' into Dev

Conflicts:
	RobotSplit/RobotSplit/Game.cpp
10:38 Paul
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
keyboard layout
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
Nya hopp med frames
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
Merge branch 'master' into Robbin