Merge branch 'master' of github.com:JonathanTR/groundhog

* Merging in quickfix for capybara gem name.
Merge branch 'master' of github.com:JonathanTR/groundhog

* Merge in Quickfix: change ./groundhog to ./groundhog_app in config.ru.
Merge branch 'master' of github.com:JonathanTR/groundhog

Merge in changes from feature 02: Upload and Convert files to gifs
Quickfix: Add dummy files to temp_video and temp_gif directories.

* It turns out that git does not track empty folders. This foiled my plan to use these two directories to store uploaded and downloadable files.
Merge pull request #8 from JonathanTR/quickfix-temp-directories

Quickfix temp directories