new file with same name
Merge branch 'master' of https://github.com/mayfer/factorygirl_examples

Conflicts:
	newfile2