changes
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	img/.DS_Store
	index.html