Fixing merge error
Merge branch 'master' of https://github.com/jamonroe/CS152HW5.git
Implemented "cond". It's not pretty, but it works. 
Added some of Mak's test files to the project for later testing.