failed commit
Merge branch 'master' of https://github.com/teamMoth/LAMP

Conflicts:
	src/midend/MidEndFormatting.java