Merge branch 'mikkel'
Merge branch 'mikkel'
added angular and stuff
Merge branch 'master' into mikkel