removed debug lines
Merge branch 'master' into portfolio