functional
Merge branch 'master' of github.com:mus0u/nichijown

Conflicts:
	nichijown