commit for merge
Merge branch 'master' of github.com:jmh045000/utd_cs6301_project

Conflicts:
	proposal/6301_project_proposal/introduction.tex