Initialisation
Update gemfile
Bug fix
Merge remote-tracking branch 'refs/remotes/github/master'

Conflicts:
	.gitignore