init
Merge branch 'master' of github.com:24hr-malmo/jul2014