stuff
index
Merge branch 'natasha'

Conflicts:
	index.php
	style.css