test files
Merge branch 'master' of https://github.com/davidmarne/Compiler
fixed conflict
Conflicts:
	src/compiler/main.java