Merge pull request #1 from ndavis10/master

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

Merge pull request #1 from ndavis10/master
Merge pull request #5 from mcarpenter5/master

Added DataModels/ViewModels
Merge pull request #1 from ndavis10/master

Update from upstream