Merge pull request #6 from sweenee/beth_dev

pulling Dev into Beth_dev before pulling my code into Dev
Merge pull request #4 from KellyBlack/dev

Merge Kelly Black Dev to Sweenee Dev