Add guitar pictures
Fix conflict
Merge branch 'erthh-branch'

Conflicts:
	application/views/templates/header.php