finished most of all of the functions.  compilation mostly working
fixed merge conflict?
Merge branch 'master' of https://github.com/apdg/430_final_project