Hopefully this doesn't actually do anything..
Merge branch 'master' of https://github.com/UWbadgers16/sim-R10K

Conflicts:
	cse-560-project-2011-read-only/sim-R10K/sim-R10K
	cse-560-project-2011-read-only/sim-R10K/sim-R10K.c
Changes.  lots of them.
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/UWbadgers16/sim-R10K

Conflicts:
	cse-560-project-2011-read-only/sim-R10K/sim-R10K
	cse-560-project-2011-read-only/sim-R10K/sim-R10K.c