Merge branch 'master' of https://github.com/jahla/jahla.org

Conflicts:
	Gemfile.lock