V0.1

The project in it's 'final' version (as a scholl project)
Merge remote-tracking branch 'origin/master'

Conflicts:
	LICENSE