new commit
Initial commit
Merge origin/master
https://github.com/maldicion069/CS-conio-h
Merge origin/master

Conflicts:
	README.md