done
Merge branch 'master' of https://github.com/efferifick/cmput291

Conflicts:
	project2/main.c
	project2/range.c