stop button impemented, note I have deleted nokogiri from gem list for my comp
Merge branch 'master' into amelia

Conflicts:
	app/views/layout.erb
	public/js/controller.js
	public/js/view.js
putting nokogiri back in for yous
Merge pull request #10 from jasminmayfield/amelia

stop button implemented, note I have deleted nokogiri from gem list for m...