fog upload setup
got rid of extra test files
Merge pull request #5 from ozayyad/pair-ozayyad,tjhernandez

trying to see if travis is working
merging with master
fix merge conflicts
Merge pull request #3 from ozayyad/Johnny

Johnny
gemfile fix
added application.yml