[ADD] first part
[MOD] Merge branch 'master' of https://github.com/FilipKsenzuliak/about-git

Conflicts:
	app.rb