merge SHA1 69773f16319ad44d8d5aea183dbcf8162e34aed4
Close #2: add gitignore, merge SHA1 8adee1fdcf35faed6bcd49584338fe9cb70ab0e5
solved conflict in readme
Merge branch 'master' into tutorial_exercises

Conflicts:
	README.md