update
Merge branch 'master' of https://github.com/PetersBrice/Game_Project

Conflicts:
	area.c
	area.h