Fixed some bugs in file reading, namely reading an empty file caused problems.
Merge branch 'master' of github.com:rascheel/coms229-project2