Initial commit
Merge branch 'master' of https://github.com/deuxnids/Wiloma

Conflicts:
	README.md
test