fixed some indents added comments to 17
Merge branch 'master' of https://github.com/dblossom/cmpt308