bringing in previous work
Merge branch 'master' of github.com:alexkau/NPProject3