Merge pull request #29 from TerabyteTyler/master

Update README.md
Merge branch 'master' of https://github.com/kmcurry/3Scape into gh-pages
Merge branch 'gh-pages' of https://github.com/kmcurry/3Scape into gh-pages
added web.config to gitignore
Merge branch 'gh-pages'
clean up gh-pages merge
update for mac and win
Bootstrap interface using sticky nav and footer
Using dashboard template for presentation space w/ preview navbar
Notes footer added to right-side content pane; still need to fix to bottom of screen within pane
Alternate layout - use one sidebar w/ tabs for preview, animate
Renamed preview to slides in sidebar
Mock top toolbar w/ dropdown menus
New note prompts a modal. Known issue on windows Chrome: modal pop-up shifts the window to the right when there's a scrollbar
Modal shift fixed
Mockup text-area form for presenter note present in modal
Removed bad links from mockup buttons
Merge conflict resolved, ready for pull request upstream
Merge pull request #33 from jonssmall/gridstrap

Gridstrap
Hooked up the BridgeWorks container to inside our layout