Initial commit
first commit
second
Merge branch 'master' of https://github.com/masaru87/MASARU
Merge branch 'master' of https://github.com/erevista/MASARU

Conflicts:
	README.md