added check for >= 1 main function in the program
Merge branch 'master' of github.com:ornata/csc435
added checking for duplicates in the same class
added checking for incorrect override/overload
added overloading for Substring/WriteLine/Write
updated makefile to include test
renamed to cb to so their scripts dont break
added link in README
first commit
cleanup
more cleanup
Merge branch 'master' of github.com:nguillemot/csc435
added unary minus
added plusplus/minusminus
implemented and/or
added while loops
Merge branch 'master' of https://github.com/ornata/csc435

Conflicts:
	a4/CbAST.cs
	a4/CbLexxer.lex
	a4/CbParser.y
	a4/CbPrVisitor.cs
	a4/CbSymTab.cs
	a4/CbTLVisitor.cs
	a4/CbTopLevel.cs
	a4/CbType.cs
	a4/CbTypeCheckVisitor1.cs
	a4/CbTypeCheckVisitor2.cs
	a4/CbVisitor.cs
	a4/LLVM-ConstantHandling.cs
	a4/LLVM-CreateClassDefn.cs
	a4/LLVM-Definitions.cs
	a4/LLVM-SSAMethods.cs
	a4/LLVM-UtilityMethods.cs
	a4/LLVM-WriteMethods.cs
	a4/LLVM.cs
	a4/LLVMVisitor1.cs
	a4/LLVMVisitor2.cs
	a4/cbc.cs
	a4/resources/Corrections.txt