Added hashtags
Merge commit '45432eac20769c0b8227e1f5b7af72ca05aa1aff'

* commit '45432eac20769c0b8227e1f5b7af72ca05aa1aff':
  Added hashtags

Conflicts:
	app.js