merge conflicts
new files from davidson
Merge pull request #52 from cptcaveman/saltymccloud

Saltymccloud