finished comparc 1 and submited
Merge remote-tracking branch 'origin/master'

Conflicts:
	Comp_arc/Assignment1/nbproject/private/private.xml
merge conflict