a
Merge branch 'master' of https://github.com/wagaduu/wagaexample

Conflicts:
	nxtplabs-stage/nxtplab.html