Merge branch 'master' of https://github.com/totruok/Test

Conflicts:
	src/source.cpp
Merge branch 'master' of https://github.com/totruok/Test

Conflicts:
	src/source.cpp