dkauchak/cs312-middlebury-tutorial — pull request #6 by willpots (2012-02-23 19:46:52+00:00)
Title: Lots of merging of files.

Some changes from willpots