･゜･*:.｡..:*･'｡. .｡.:*･゜･*
Merge branch 'master' of github.com:motoishmz/of-baseapps

Conflicts:
	README.md