fixing some prettyPrint() stuff
Merge remote-tracking branch 'origin/master'
commiting to merge
Merge remote-tracking branch 'origin/master'
commiting to merge