Merge conflicts are fun
Merge branch 'master' of https://github.com/tinfoilboy/RandomHashtagGenerator

Conflicts:
	hashtag.js