Merge pull request #1 from zephyrz4/master

Added basic stuff u like?
Merge pull request #2 from zephyrz4/master

New makefile
Merge pull request #3 from zephyrz4/master

oops
Updated SFML library using mingw32
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/SFML/bin/sfml-audio-2.dll
	src/SFML/bin/sfml-graphics-2.dll
	src/SFML/bin/sfml-network-2.dll
	src/SFML/bin/sfml-system-2.dll
	src/SFML/bin/sfml-window-2.dll
	src/test.exe