dare599z/CSCIproject — pull request #1 by austruck (2014-06-26 13:41:22+00:00)
Title: merge so that i can copy files in

github is not letting me do wanything in the branch for some reason som im trying to merge it