testing commit
commit in master again
Merge branch 'testing-1'

Conflicts:
	readme.txt
new file
bugfix
added some work in the license file for issue 53
edited the license file for legal - hotfix
Merge branch 'issue53'

Conflicts:
	LICENSE