test
Merge branch 'master' of http://github.com/jundi/lafy

Conflicts:
	1-harj/report/report.pdf