Add more info to main
Merge branch 'master' of https://github.com/Lavesson/my-demo-repo

Conflicts:
	source/main.cpp