add the old Gemfile so that github will give me the master update
Merge branch 'master' of https://github.com/volgorean/filmtastic

didn't change anything, just needed to pull master
add the files that we are merging from the updated master
Merge branch 'master' into testing

add the files, nothing changed
Merge pull request #7 from volgorean/testing

Testing