1.6d
Merge branch 'master' of https://github.com/eyan422/PersonalProject

Conflicts:
	lighdl.c