Merge pull request #30 from TerabyteTyler/master

Update README.md
Merge branch 'gh-pages'
clean up gh-pages merge
update for mac and win
Mockup text-area form for presenter note present in modal
Removed bad links from mockup buttons
Merge conflict resolved, ready for pull request upstream