Image loading
Merge branch 'master' of github.com:interarticle/safe-history

Conflicts:
	index.html
	js/game.js