Initial commit.
Ok, fixed some rough edges.
Merge remote-tracking branch 'github/master'

Conflicts:
	LICENSE