Trying to commit again ...
Merge branch 'master' of http://github.com/noahpc/WhiteCollar