more edit stuff
Merge branch 'master' of github.com:shravmehta/Marx

Conflicts:
	app/assets/javascripts/pages.js