Refactor audioplayer functions to media object
Update grunt and add media.js to git
Basic video support
Better UI for video upload
Video filetype improvements
Timestamps now work with video
Video element width scales to match window width
Integrated progressor.js
Controls width adjustments
Added hotlink to latest version of progressor.js
Merge branch 'master' into progress
Adjusted spacing for controlbar
Updated to Progressor.js v0.2.1
Updated homepage
Updated Readme
Grunt tasks now compile on first run
Remove refresh button
Graduate export function
Cleanup
Merge branch 'progress'

Conflicts:
	index.htm