leave me alone, git
ugh merge
unfucked my files after merge... gotta work on mergetool
Merge branch 'master' of github.com:alpearce/cis341
added gitignore
i hate merging
LEKJOISFJS:KDFJE:OIFJS
Merge branch 'master' of github.com:alpearce/cis341
Merge branch 'master' of github.com:alpearce/cis341
merge
eniac
Merge branch 'master' of github.com:alpearce/cis341
fixed problems with calls and paths THANK YOU STEVE