Contents controller created #2
Merge branch 'master' of scream