new assignment
Merge branch 'master' of https://github.com/sreya92/Comp530Assn

Conflicts:
	assignment4/assignment4/a.out