Added an edit-button
Merge branch 'master' of https://github.com/Naztor/freezing-shame into Kristoffers_workbranch
Merge branch 'master' of https://github.com/Naztor/freezing-shame into Kristoffers_workbranch
made an editbutton, and fixed som smaller bugs
Merge branch 'master' of https://github.com/Naztor/freezing-shame