updated readme; js refactoring

Conflicts:
	public/javascripts/main.js