added text to bottom
Merge branch 'master' of https://github.com/mayfer/factorygirl_examples
headless changes
changes in branch
Merge remote-tracking branch 'origin/newfeature'