this was on the web, how do i sync?
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.htm
	script.js