Added confusion icon to play bar
Added confusion database, confusion post
Merge pull request #26 from thompsona/confusionButton

Added "confused" button and confusion data storage
Delete a comment
Merge pull request #27 from khempenius/deleteComment

Delete a comment
DB schema changes for deleting comments
Merge pull request #28 from khempenius/comments

DB schema changes for deleting comments
Correctly compiled modified version of lessonplan.js
Merge pull request #29 from thompsona/correctLessonPlan

Correctly compiled modified version of lessonplan.js
Added on/off indicators for comments and subtitles
Merge pull request #30 from khempenius/comments

Added on/off indicators for comments and subtitles
Basic volume control icon added
Mergefix, added basic volume control icon
Merge branch 'master' of https://github.com/mcb80x/minimal-player into volumeControlPull

Conflicts:
	static/css/mcb80x.css
Merge pull request #31 from thompsona/volumeControlPull

Volume icon added
Mute/unmute functionality added
Merge pull request #32 from thompsona/volumeControl

Mute/unmute functionality added
Functional volume slider added, not in correct place visually
Volume controls located in correct place on controls bar
Merge pull request #33 from thompsona/volumeControl

Functional volume control slider