Mockup finished.
Merge branch 'master' of https://github.com/chrisjh/comp426 into a3
Merge pull request #2 from chrisjh/a3

A3 Mockup Finished