Merge remote-tracking branch 'origin/master'
Fixed smokeymonkey's image file path
Merge branch 'master' of https://github.com/ogagaga/smokeymonkey-amazon-prize-life

Conflicts:
	public/index.html