Gotta watch these merge conflicts :)
Merge branch 'master' of https://github.com/noahpc/WhiteCollar