first commit
Merge branch 'master' of https://github.com/zornstar/diva

Conflicts:
	README.md