save before merge
merge complete
pre-merge
merge complete
capybara can find file now
Merge pull request #2 from johnnymo87/master

Cuke step for file upload passes