push test
Merge branch 'master' of github.com:dy8487/Canvas

Conflicts:
	.gitignore
test