Please ignore
Merge branch 'master' of https://github.com/cs27x/team6 into feat/alexander_wan

Conflicts:
	asgn1/assigned_project/code/GroupSixAsmtOne/app/app.iml
	asgn1/assigned_project/code/GroupSixAsmtOne/gradle/wrapper/gradle-wrapper.properties
Added test cases for Restaurant class
Fixed one error and a comment.
Merge pull request #18 from cs27x/feat/alexander_wan

Feat/alexander wan