Update LICENSE
Update LICENSE
Update LICENSE
Update LICENSE
Merge branch 'master' of https://github.com/jellybellys/convo

Conflicts:
	LICENSE