Initial commit to throwawaY
Merge branch 'mockup-throwaw' of https://github.com/Team-CMPUT301F13T12/301-Project
Adding my changes from local repo.