Initial commit
Merge branch 'master' of github.com:koroket/RedditOnRails

Conflicts:
	.gitignore