Changed header documentation. no longer 'empty'.
Merge branch 'master' of https://github.com/akmadsen/sisyphus1.git

Conflicts:
	Sisyphus1/src/driver/Driver.java
trying to solve Driver conflict... fark