changed icons
stuff
added disqus
changed button colors
Merge branch 'master' into georgiana

y
updated edit.html