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

Conflicts:
	index.html
	stylesheets/screen.css
some changes
some changes