after feb 4 meeting
Merge branch 'master' of https://github.com/CMPUT302W14T04/Interface

Conflicts:
	ProjectDesignMilestone.docx
Merge branch 'master' of https://github.com/CMPUT302W14T04/Interface

Conflicts:
	ProjectDesignMilestone.docx