Knapsack Solver.
Merge branch 'master' of github.com:dohnto/grans-bare

Conflicts:
	src/pso/Particle.java
	src/pso/Solver.java