commiting again
Merge branch 'master' of github.com:jesseschloss/Funzies

Conflicts:
	newtext.txt