20141107
Merge branch 'master' of github.com:cooperhewitt/collection