Merge branch 'master' of https://github.com/efuste/Tutorial

Conflicts:
nbproject/private/private.properties
Update Chapter 4 Enhanced
Update