sdaf
Merge branch 'master' of github.com:ggomes/lp-ramp-metering

Conflicts:
	lp-ramp-metering.iml
	src/main/java/lp/solver/LpSolveSolver.java