other note
Merge branch 'master' of https://github.com/agerome/Game

Conflicts:
	Development_Feed.txt