l
p
Merge branch 'master' of https://github.com/esel7353/fp2

Conflicts:
	laser/laser.pdf