touyched hahahaha.txt
Merge branch 'master' of https://github.com/p1co/smc_programming_club
Merge branch 'master' of https://github.com/p1co/smc_programming_club
resolve conflicts
remove conflict