Eclipse try
Merge branch 'master' of https://github.com/sonicyang/RPG

Conflicts:
	Final Project.layout
	Makefile