add Topic
Merge branch 'master' of github.com:vergilet/hereiam

Conflicts:
	Gemfile
	Gemfile.lock