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

* Merging in quickfix for capybara gem name.
Merge pull request #6 from JonathanTR/development

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

* Merge in Quickfix: change ./groundhog to ./groundhog_app in config.ru.
Merge pull request #7 from JonathanTR/development

Development
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
Merge branch 'master' into development

* Master contained dummy files for quickfix of empty temp folders problem.
03-a: Add fields for start time and end time.
03-b: Refactor Validations and add validation for time span.
03-c: Add basic style to uploader page.
03-a,b,c: Move validation errors to appear after submit button.
03-c: Add light shadow below uploader.
03-b: Bugfix - add parseInt for start and end inputs.

* Apparently these were being entered as strings, which throws off the comparison in the validation.
03-d: Pass start and end times to convert_to_gif.

* There doesn't appear to be a good way of testing the correlation between the start and end times passed in, and the length of the gif. FFMPEG::Movie.new() provides some methods for duration, length, etc. but these attributes return nil values on a gif file.
Ignore all but dummy files int temp_gif and temp_video.

* This way, any files processed in development will not be accidentally committed.
Merge branch '03-start-end-times' into development