css
Merge branch 'master' of https://github.com/kirbyk/snapwall
3x4
add likes
Merge branch 'master' of github.com:kirbyk/snapwall

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
Merge branch 'master' into staging
gem lock
Merge branch 'master' into staging