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
Merge pull request #5 from justinbeal/ignore-stuff

Ignore stuff
Merge pull request #4 from justinbeal/create-thread-model

Create thread model
Merge branch 'master' into routes-for-topics-and-posts

Conflicts:
	.gitignore