Merge pull request #21 from comp380team3/castello-architecture

Implement major architectural points
Merge branch 'master' into game-mechanics-newarch