More modal fixes.

 On branch master

	modified:   public/index.html
	modified:   public/scripts/main.js
	modified:   public/stylesheets/main.css
Fix hash update conflicts

 On branch master

	modified:   public/index.html
	modified:   public/scripts/main.js