blog is in progress
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza
blog is done
gallery is done
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza

Conflicts:
	app/assets/javascripts/lib/jscrollpane_iniialize.js.coffee