initial checkin
minor revisions
Initial checkin
preparing .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	LICENSE