commit
Merge branch 'master' of https://github.com/manuts/coding

Conflicts:
	tests/a.out