Very initial solution.
modified k
Added java
Merge branch 'master' of https://github.com/krasm/opti

Conflicts:
	Solver.java