2nd
Merge branch 'master' of github.com:adamliesko/tryit

Conflicts:
	demo