Frist commit
Merge branch 'master' of github.com:botan32/computer-technics

Conflicts:
	Makefile