Initial commit
Merge local & GitHub
Remove old license
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore