Merge branch 'master' of https://github.com/999studios/FirstGitHUbProject

Conflicts:
	Untitled.rtf
lkjiopji