Merge branch 'master' of https://github.com/p1co/smc_programming_club

Conflicts:
	README.md
adsf
hello
Merge branch 'master' of https://github.com/p1co/smc_programming_club

Conflicts:
	README.md