pulling file reading
Merge branch 'master' of https://github.com/hannawii/348b_finalproject