Haha
pasten

Conflicts:
	README.md
jkhckjhfk
Merge branch 'master' of https://github.com/telavivmakers/git-workshop

Conflicts:
	README.md
Merge branch 'master' of https://github.com/telavivmakers/git-workshop

Conflicts:
	README.md
Merge branch 'master' of https://github.com/telavivmakers/git-workshop

Conflicts:
	README.md