modified:   de-bruijn.hpp
	new file:   de-bruijn-example.cpp
	modified:   context.hpp
	modified:   context.hpp
	modified:   environment.hpp
	new file:   semantics-test.cpp
	new file:   semantics.hpp : Code from semantics-impl.hpp
	Made modifications for semantics blah, blah
	modified:   semantics-test.cpp
	modified:   semantics.hpp
	modified:   ../syntax/builtin/builtin-example.cpp
	modified:   ../syntax/builtin/builtin.hpp
	modified:   ../syntax/de-bruijn-example.cpp
	modified:   ../syntax/variable.hpp
	modified:   semantics-test.cpp
	modified:   environment-example.cpp
	modified:   environment.hpp
	modified:   ../syntax/abstraction.hpp
	modified:   ../syntax/application.hpp
Merge branch 'environment-redesign'

Conflicts:
	lambda-core/lambda-interpreter/context.hpp DONE

	modified:   context.hpp
	modified:   environment-example.cpp
	modified:   environment.hpp
	modified:   ../syntax/abstraction.hpp
	modified:   ../syntax/application.hpp
	modified:   lambda-interpreter/environment-example.cpp
	modified:   lambda-interpreter/semantics-test.cpp
	modified:   lambda-interpreter/semantics.hpp
	modified:   syntax/builtin/builtin.hpp