Merge branch 'master' of https://github.com/larufa/LabHomePage.git

Conflicts:
	nakaLabHP/test.txt
Merge branch 'master' of https://github.com/larufa/LabHomePage.git