Merge branch 'master' of https://github.com/garwong/ABC-Toys

Conflicts:
	.DS_Store
sync

Conflicts:
	.DS_Store
changes
Merge branch 'master' of https://github.com/garwong/ABC-Toys

Conflicts:
	.DS_Store
	Angry_Robot.css
	images/.DS_Store