Ruby extension
Merge branch 'master' of https://github.com/berma/berma.github.io

Conflicts:
	Gemfile
ruby