ls and makefile changes.
Merge branch 'master' of github.com:nhilliard/cs301-p2