Lagt till knappar i GUI
Merge branch 'Tobias'
Merge branch 'Me'
Merge branch 'master' into Tobias