readme
no errors
locked change
Merge branch 'gui'

Conflicts:
	src/Solver.java
Merged gui in master branch
improved gitignore
Merge branch 'gui'
gui added to master
Better UI