First commit
Merge branch 'master' of https://github.com/NikolaiKleppe/SFML-testing
heisann