merging master with vbranch
pre merge with vbranch
merge completion
add if keyword handling
adds define printing
pre merge commit
Merge branch 'master' of https://github.com/tford9/CSC-4101-Projects into vbranch

Conflicts:
	proj1/Project_Skeleton_Code/Define.java
	proj1/Project_Skeleton_Code/If.java
	proj1/Project_Skeleton_Code/Main.java
	proj1/Project_Skeleton_Code/Regular.java