Döpt om images till img
Merge branch 'master' of github.com:montania/WP-Theme-Boilerplate

Conflicts:
	header.php