first commit
Added files
More files added
Edit
edit
Merge branch 'master' of github.com:Connor-Knabe/Ski-Excision

Conflicts:
	about.html
	contact.html
	img/.svn/all-wcprops
	img/.svn/entries
	references.html
	reviews.html