New stuff
Merge branch 'master' of github.com:Hack42/Museum