Revert "Change Text"

This reverts commit 80c84bfebe2a020765143d58ac67e835f92e2120.
Revert "Change Text"

This reverts commit 80c84bfebe2a020765143d58ac67e835f92e2120.
Merge branch 'Test' of https://github.com/abhinavnair92/MiniPaint into Test
Trangle

simple example
Merge remote-tracking branch 'origin/master' into Joe
gitignore stuff
gitignore
Merge branch 'Joe' of https://github.com/abhinavnair92/MiniPaint into Joe
goddamn
Merge branch 'Joe' into David

Conflicts:
	.gitignore
ignore internal gitignore