Added DLLs
merge conflict-test
Test
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/main.cpp
display/eventhandler/eventmanager