project commit
Merge branch 'master' of github.com:naonya3/NNInfinityTabView

Conflicts:
	LICENSE
	README.md