Took out initFromModel in controllers. Made small changes to ResourceBar.
Merge branch 'master' of https://github.com/255/catan