Resource map is passing all 5 traces.
Merge branch 'master' of https://github.com/jordangeltner/OS_Project2

Conflicts:
	Makefile