Milestone 2 Compliance
Attempt to end merge conflict
Merge branch 'rebase' of git://github.com/JonDub/CSCI.468-Compilers into rebase

Conflicts:
	Project1/parse_tree.txt
	Project1/parser.cpp
	Project1/uCode.pas