initializr
initializr
initializr
commit
commit
Merge branch 'dev'

Conflicts:
	_site/blog/2012/04/10/what/index.html
	_site/public/js/application.js

initializr
initializr
Merge branch 'dev'
Merge branch 'master' into dev
mhm
Merge branch 'dev'
initializr