Merge branch 'master' of github.com:woltage/codecamp14-whitetrash
Rename