kostas
new comment line added
Merge pull request #2 from kalexio/master

new interesting commit
Merge pull request #3 from jennyc112/master

Jennifer pull req
Merge branch 'master' of https://github.com/cseri/stools-test

Conflicts:
	main.cpp