I am not sure what I have done here.
Merge branch 'master' of github.com:mikejmoffitt/mdgame

Conflicts:
	src/gamedata.c