Marcus egna branch
Marcus branch commit
Merge remote-tracking branch 'origin/marcus'
Added some demos
test
JAJA jag ska commita
Merge remote-tracking branch 'origin/johan'
hej