Fixed header image detector.
Fixed merge conflict.
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme
Merge branch 'master' of github.com:OrangeRoomSoftware/WP-HTML5-Parent-Theme