switching images on a single html page
Merge branch 'master' of https://github.com/Seonaid/hack-cyoa

Conflicts:
	assets/css/style.css
	index.html
fixing conflicts