parser
Merge branch 'master' of https://github.com/Spide90/LinearProgram

Conflicts:
	src/model/LPProgram.java