added images
added images
Merge branch 'master' of github.com:ngzhian/snowball

Conflicts:
	js/main.js