Pulling in proj2. Merge branch 'proj2'
Pull in changes from remote master prior to merge. Merge branch 'master' of github.com:aggroskater/ee4323-digital-image-processing