another clean start...
Merge branch 'master' of https://github.com/inkbiegel/moodstock2014