STUFF
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web Files/Clay_Website/index.html
Merge branch 'master' of https://github.com/clayboren/web-files

Conflicts:
	Web Files/Clay_Website/.htaccess