likes update
Merge branch 'master' of https://github.com/kikak/about-git

Conflicts:
	app.rb