Merge branch 'master' of https://github.com/openshard/code
Merge branch 'swap_function'
first_merge
Merge branch 'master' of https://github.com/openshard/code
Merge branch 'master' of https://github.com/openshard/code

Conflicts:
	first.cpp
Merge branch 'master' of https://github.com/openshard/code
ововоово
commited