converting
Merge branch 'master' of https://github.com/Criten/orange-porridge into convert
SFML IS HERE