Merge branch 'master' of github.com:gicappa/api-spike
Content type!