first commit
Merge branch 'master' of github.com:devil199298/Project

Conflicts:
	README