add an img
yellow background
Merge branch 'master' of github.com:oponder/practice-git-flow into add_background
Merge pull request #4 from oponder/add_background

Add background
Merge branch 'feature_header'

Conflicts:
	index.html