Update package.json
Add license file
Merge branch 'upstream'

Conflicts:
	package.json
Merge branch 'master' of github.com:Hackademy2013/drawesome

Conflicts:
	package.json