a
b
c
Merge branch 'master' of https://github.com/rahajarison/GGJEngine

Conflicts:
	sources/main.cpp
d
Merge branch 'master' of https://github.com/rahajarison/GGJEngine

Conflicts:
	bin/Release/Data/Image/background_rose.png