fix lambda calls and change define to work with it
Merge branch 'master' of https://github.com/tford9/CSC-4101-Projects