Skapat saker i github
Merge branch 'master'
Merge branch 'test'