Derp.
Derp 2
Merge branch 'master' of https://github.com/jeffreycentex/txstate-cs

Conflicts:
	cs4328/proj2/README.md