Bundler auto-generated files.
Merge branch 'master' of github.com:billyogat/rpg_initiative

Conflicts:
	.gitignore
	README.md