Updated makefile
Test
test2
Trying to fix weird crash problem
test
removed exe from index
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
Added some ignore and added a Makerule for all
Fixed an issue with windows
Apparently windows doesnt like makefile stuff :(
Added detection for windows/linux for makefile
Merge pull request #4 from zephyrz4/master

Some makefile changes