first commit
Merge https://github.com/sunafajro/myproj

Conflicts:
	LICENSE
	README.md