test
Merge branch 'gh-pages' of https://github.com/joanteruel/lerion into gh-pages

Conflicts:
	_posts/2014-05-25-apps-2014.md