Fixed Area.java checkstyle
Merge branch 'master' of https://github.com/justinpieper/mhcs

Conflicts:
	src/edu/umn/d/grenoble/mhcs/modules/Area.java