Ny SFML
Merge branch 'Elias'
Hej
Merge branch 'Elias'
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias
Hej
Hej
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into Elias

Conflicts:
	Jam/Jam/Editor.cpp
	Jam/Jam/Editor.h
Editor
Merge branch 'Elias'
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/Ball.cpp
	Jam/Jam/Ball.h
Camera
Merge branch 'Elias'
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/Cat.cpp
commit
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian

Conflicts:
	Jam/Jam/Cat.cpp
yarn
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk

Conflicts:
	Jam/Jam/Cat.cpp