delete contents controller
weird merge issues
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail