initial commit
Merge branch 'master' of https://github.com/OnilPereyra/pinteresting-onemonthrails

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/OnilPereyra/pinteresting-onemonthrails

Conflicts:
	.gitignore