Compiled SFML into SFML-2.1-final folder, header files are in include and libs/dll are in lib, got a basic SFML program working within my UI code
Merge branch 'master' of https://github.com/shrackner/TetrisBuddies

Conflicts:
	Not a text.txt