not working, work in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ParserTest/Main.java
not working, work in progress