Merge pull request #1 from TeamTurtleF14/master

SFML Ready
Merge pull request #2 from TeamTurtleF14/jocelyn

Merge pull request #1 from TeamTurtleF14/master