Added feature1
Added feture 2
Added additional features to feature2
Merged feature 2 into master
Added feture 3
Fikset fix1
Fikset litt mer på bug1234
Added fix for v1.0
Fix 2 for v1.0
Added fix for v1.0
Merge branch 'v1.0_fixes'