start working on adding hashtag
adding hashtag, working on jquery
remove undefined index notices on clean install
merge conflict