Merge branch 'master' of https://github.com/Code-Athei/Language

Conflicts:
	lang.md
Merge branch 'master' of github.com:Code-Athei/Language