starter code
Create README.md
Starter code
Merge branch 'starter'

* starter:
  Starter code
  Create README.md
  starter code

Conflicts:
	README.md
	js/content.js