add placekitten for main image
fix image placeholders
Merge branch 'master' of github.com:benhorne44/music

Conflicts:
	app/views/landing/index.html.erb