add search route
search
search form
search
add username and link it to profile
search template
fix merge conflict
add comments with disqus
add comments with disqus
merge master and fix conflicts
Merge pull request #3 from xtina-starr/content

Content