updated index, added two images, update css
Merge branch 'master' of https://github.com/theodi/colleen

Conflicts:
	web/css/default.css
	web/index.html