Merging gemfile
About to pull
Merge
Fix stupid bug where the flash wasn't showing up
Specs and finished