activity 4
wat
Merge branch 'master' of https://github.com/macarr/cse3481.git

Conflicts:
	Activity3/bin/activity3/Q6
	Activity3/bin/activity3/Q7
	Activity3/src/activity3/Q6
	Activity3/src/activity3/Q7