edit
Merge branch 'master' of github.com:gitnishida1/githubtest

Conflicts:
	wiiu.txt