Finished updates to employee-info page
Renamed files and directories and added includes
Finished admin-home page
Content page now matches the view
Merged generator-changes
Merge pull request #28 from BYUI-Web/employee-info

Finished updates to employee-info page
Finished admin-home with body copy
Merged generator-changes
Forgot one conflict line
Merged generator-changes
Merge pull request #31 from BYUI-Web/admin-home

Admin home
fix homepage sample
fix homepage styles

carousel top-margin, newsroom/events responsive behavior
fix padding issue
Merge pull request #33 from BYUI-Web/design-continuity

Design continuity for homepage
Merged generator-changes