first commit
first commit
1
2
Merge branch 'master' of https://github.com/matemink/WIAMWidget

Conflicts:
	.gitignore
xmls