like is implemented with javascript
completed merge
merging
Merge branch 'master' of https://github.com/thinkpad20/synesthesia
commiting
merged Merge branch 'master' of https://github.com/thinkpad20/synesthesia

Conflicts:
	app/views/users/show.html.erb