First commit
Merge branch 'master' of https://github.com/jabawack81/follow_friday_creator_rails

Conflicts:
	.gitignore