Resolutions update
Merge branch 'master' of github.com:pydanny/pydanny.github.com