Initial commit
Merge branch 'master' of github.com:acken/NDCOslo2014