changes
Merge branch 'master' of https://github.com/taylorniki/RollergirlsInPagosa

Conflicts:
	contact.html
	skaters.html
	styles/base.css
fixed merging mistakes