Merge branch 'master' of https://github.com/gingu/mypsi46test

Conflicts:
	Nucleus.h
Merge branch 'master' of https://github.com/gingu/mypsi46test

Conflicts:
	Nucleus.h