Merge remote-tracking branch 'scott/master'
Added AreaHolder and implemented
Merge branch 'master' of https://github.com/justinpieper/mhcs