Merge pull request #1 from ndavis10/master

Update from upstream
test
Edited layout and site again
Merge pull request #4 from Barterdm04/master

Merge pull request #1 from ndavis10/master