Renamed files and directories and added includes
Finished admin-home page
Finished news detail 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
Changed news-detail page to use figcaption in the figure instead of a p tag
Updated index page with correct link and changed around some of the markup on the news-detail page
Modified the less file and added the necessary imports at the top
Merged generator-changes
Merge pull request #30 from BYUI-Web/news-detail-page

Finished news detail page
Merged generator-changes