Merge branch 'circuitcontrib_testNavBar' of http://github.com/asonix/mediasite into circuitcontrib
Merge branch 'master' of http://github.com/asonix/mediasite into circuitcontrib
Initializing branch
merged with circuitfrycontrib
PUSH THE BABBY OUT
what
Merge branch 'circuitfrycontrib' into asonix
Mostly finalized the bottom half.
There we go.
made external slide buttons, fixed nav
re-added previous changing functionality
Merge branch 'asonix' of http://github.com/asonix/mediasite into circuitfrycontrib
Sync with asonix
guh
fixed toolbar on small screens
Merge branch 'asonix' of http://github.com/asonix/mediasite into circuitfail
Fixed the header text
Fully fixed the topbar
works now, needs pause icon
Added pause button