func decomp done
Merge branch 'master' of github.com:horsetailfiddlehead/ee478
added images of game play
latex update
Merge branch 'master' of github.com:horsetailfiddlehead/ee478

Conflicts:
	Final Project/Documentation/CapstoneReport.pdf
	Final Project/Documentation/CapstoneReport.tex
Took repos
fixed compile errors