end of hw2
Merge branch 'master' of https://github.com/markthueson/cs6460

Conflicts:
	hw2/usr/dev_access
	hw2/usr/dev_access.o