fog upload setup
got rid of extra test files
merging with master
fix merge conflicts
Merge pull request #3 from ozayyad/Johnny

Johnny