lab 3 skeleton
Merge branch 'master' of github.com:mcanini/INGI2145-2014