made files
Merge branch 'master' of https://github.com/rachelboy/HFID-website

Conflicts:
	prototype/css/main.css