Command line commit - desperation ensues!
Merge branch 'master' of https://github.com/gamedevgroup/GamemakerTest

Conflicts:
	01-MyFirstGame1.gmx/01-MyFirstGame1.project.gmx
	01-MyFirstGame1.gmx/rooms/room0.room.gmx

BROTHER, YOU ASKED FOR IT!