Revert d76b407..386c600

This rolls back to commit d76b407f69bf4d31bc5665fac5bb88103b0297a4.
Revert 3bea454..4ee360a

This rolls back to commit 3bea454933cc0443803c7dff9c3b3d87d099eec7.
Merge branch 'master' of https://github.com/tanniiz/WrackAMole