Final copy
Merge branch 'master' of github.com:nav3/IS218