this is just an update
hope this works

Merge branch 'master' of github.com:sbarnekow/sbarnekow.github.com

Conflicts:
	stylesheet1.css