merging
Merge branch 'master' of https://github.com/guts2014/HoboSort

Conflicts:
	js/main.js