Ignore File Modified
Windows Ignore Edit
Revert "Change Text"

This reverts commit 80c84bfebe2a020765143d58ac67e835f92e2120.
Trangle

simple example
Configuration
Eclipse crap
Pray This Worksa
Fixing the Ignore
Merge branch 'master' into David

Conflicts:
	Assignment1_minipaint/Debug/Assignment1_minipaint
	Assignment1_minipaint/Debug/Test.o
I'm not sure what this commit means sorry