Added .idea to gitignore@
optimised tutorial code
Fixed merge conflicts in gitignore