Merge branch 'master' of https://github.com/kikokiko00/151722441

Conflicts:
	.gitignore