committing these to make aston git able to pull
Merge branch 'master' of https://github.com/Jarob22/dsa_cpu

Conflicts:
	2_part_cw/stuff.txt
	2_part_cw/work-obj93.cf
started work on part 3