start!!!!
Merge branch 'master' of https://github.com/Laeyoung/redspot

Conflicts:
	.gitignore