debugging
Revert "debugging"

This reverts commit d971d109098c6626d53ba3f4967f8e94631c0eef.
Fixing Merge Conflict
Merge pull request #3 from ezzy1337/Derek_Edits_10_8_14

Derek edits 10 8 14