Algorithm now working
Merge branch 'master' of http://github.com/prg2lt7/con4