updated .gitignore
Merge remote-tracking branch 'origin/master'
modified .gitignore
Merge branch 'master' of github.com:julian-upc/discrete-geometry-lecture-notes
example code from class