Did stuff that fixed other stuff
Fixed merge issues
Unbreaks the broken code
Merge branch 'marketplace' of github.com:00stefan00/ITACT_GetConnected into marketplace
Stefan fixing Stefan his merge
you guys broke it with your refactoring! Me has fixed it AGAIN!
Fixed spelling
Added tests
Merge branch 'master' into traveller