Gemfile changes
Removing .idea files from git
Gitignore file
Merge branch 'ignore-stuff' into create-thread-model

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
Removing idea file