update
Merge branch 'master' of https://github.com/wbsimms/MyHashTags

Conflicts:
	README.md