update
gitignore
Merge branch 'master' of https://github.com/darkn3rd/oop-tut