Button-updates
Merge branch 'master' of github.com:NegatioN/ProgrammeringOblig