done
grammar
change link order
Merge branch 'design '

Conflicts:
	index.php
changing the order of sites