Working on pause / replay functionality
Merge branch 'master' of https://github.com/klickr/klickr-chrome into bugFix
Merge pull request #39 from lramsey/debugging

fixed multi-page annotation bug
Push up changes to delete button
Merge branch 'master' of https://github.com/klickr/klickr-chrome into fixDeleteBtn
Merge pull request #40 from fay-jai/fixDeleteBtn

Fix delete btn
bugs
Merge branch 'master' of https://github.com/klickr/klickr-chrome into debugging

Conflicts:
	popups/app.js