merge and updated git ignore
Merge branch 'master' of https://github.com/Gabs00/om-presentation
change due to Shawn's rec
Merge pull request #1 from huyphamily/master

fix to Shawn's rec