todays
todays final
Merge remote-tracking branch 'origin/master'

Conflicts:
	smude/css/style.css
	smude/index.html
todays final