Commented code and rearranged files.
Merge branch 'master' of github.com:clifform/340-project