new
Merge branch 'master' of https://github.com/vinova-summer-school/vss2013-03_ghost-house