Merge branch 'master' of https://github.com/rocketu/group-project-base into garrett-branch
Merge branch 'master' of github.com:rocketu/group-project-base
Right nav set up. Still need to move the arrows, make right nav scrollable
Removed unnecessary files.
The divider runs to the top, controls changed.
Merge branch 'garrett-branch' of https://github.com/brittkistner/group-project-base
Horizontal lines meet divider.
new commit
new commit
sidebar progress
Still have button, details of comments to do.
Presentation separated from navigation bar.
merge conflict for index.html
Merge branch 'garrett-branch' into develop