gemfile/gitignore update
Update Gemfile.lock
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz

Conflicts:
	.gitignore