Merge pull request #29 from lawinslow/master

G16 preso
Merge pull request #30 from lawinslow/master

Update Preso
Merge remote-tracking branch 'upstream/master'