everything
Merge branch 'master' of https://github.com/pooyh/compsci290s

Conflicts:
	EVERYTHING.txt