resolve2
Merge branch 'master' of https://github.com/RfanKD/Ecse426_LAB3

Conflicts:
	src/main.c