aveux
Merge branch 'master' of https://github.com/Xcaliburne/Nintendo

Conflicts:
	Test.txt