Merge branch 'master' of https://github.com/qjhe96/pj2

Conflicts:
	GRADER
Loolo