update 1.1.5
update 1.1.5 imgs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	.gitignore
	css/layout.css