Initial push
Merge commit '4500f3ff59a5ca622ed153b6a610d7f5c534a8d9'

Conflicts:
	LICENSE