Add licensing information finally
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Add LICENSE file
Merge pull request #55 from boom1992/master

Add License information