nb
Merge branch 'master' of https://github.com/nbabynyuk/learning-git-basics

Conflicts:
	src/learning/basics/Demo2.scala