Fixed conflicts - 2
Merge pull request #1 from jsussman22/Scoopadoop-master

Commit changes made
Carrie's Code/Changes

My base code.
Merge pull request #4 from moegerc/master

Updated with moegerc code
Merge pull request #2 from jsussman22/master

Changes made during fork pull