#4 Feature for later
Merge branch 'release-1.0' into dev
add .gitignore
Merge branch '4_feature_for_later' into dev
Merge branch 'hotfix-1.0' into dev
change gitignore
#5 Final feature
Merge branch '5_final_feature' into dev
Revert "Merge branch '4_feature_for_later' into dev"

This reverts commit ead0494449f2e713758a84538a29b6c9e0584be9, reversing
changes made to 1fb38b1675deb02b02e5fa9b902193cbe0eecd7d.
Changed to version 1.1
Merge branch 'release-1.1'