Wes's Branch
Merge branch 'Austin' of https://github.com/beta382/Tetris into develop

Conflicts:
	Tetris/src/GLUT_Plotter.h
Screw gitignore
Remove unnecessary lines

Weird “head” stuff
Updated color scheme... more coming
Merge pull request #10 from beta382/Wes

Updated the color scheme
fixed merge conflict