edit
show/hide edit comment
fixed title blocks
Merge branch 'master' of github.com:alexpien/hackduke2013

Conflicts:
	app/views/stashes/show.html.erb
	app/views/users/show.html.erb
Merge branch 'master' of github.com:alexpien/hackduke2013

Conflicts:
	config/routes.rb