regel added
Merge branch 'master' of https://github.com/stealthjong/les3

Conflicts:
	file1