Gemfile
Merge branch 'master' of https://github.com/koelncampus/kc201x

Conflicts:
	Gemfile