Finished functionality
Merge branch 'master' of github.com:mcrussell/CSC300Lab3
Working we think