stopped the map madness
merged stuff
refactored model and loading of data
Merge branch 'master' of github.com:haugene/fagdagen