task 1 and 2 boosted
Merge branch 'master' of https://github.com/jiayuanmark/CS276-PA4

Conflicts:
	ranked.txt