Fuck this shit!!!
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	CS 530 Assignment 2/CS 530 Assignment 2.sdf
	CS 530 Assignment 2/CS 530 Assignment 2.suo
	CS 530 Assignment 2/CS 530 Assignment 2/Assembler.cpp
	CS 530 Assignment 2/CS 530 Assignment 2/Debug/Assembler.obj
	CS 530 Assignment 2/CS 530 Assignment 2/Debug/CS 530 Assignment 2.log
	CS 530 Assignment 2/CS 530 Assignment 2/Debug/vc100.idb
	CS 530 Assignment 2/CS 530 Assignment 2/Debug/vc100.pdb
	CS 530 Assignment 2/Debug/CS 530 Assignment 2.exe
	CS 530 Assignment 2/Debug/CS 530 Assignment 2.pdb