test file

test file
deleted
test
test

test hellooooo
Added 11/20 in-class changes for Forrest
Added dropdown caret
Header/Sidebar Styles updated
Removed unwanted files
fixed nav styles and prepped for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	footer.php
	front-page.php
	header.php
	style.css

Removed unwanted files

Header/Sidebar Styles updated

Added dropdown caret

Added 11/20 in-class changes for Forrest

test

test hellooooo

test

deleted

test file

test file