more progress on the GUI; working grid
Merge branch 'master' of https://github.com/rhphung/inf122Final

Conflicts:
	BoardGameClient/src/edu/uci/ics/BoardGameClient/Action/Action.java