(Incomplete) 'Pencil' icon added, but timeline needs to be reformatted
Merge branch 'master' of https://github.com/mcb80x/minimal-player

Conflicts:
	static/css/mcb80x.css
Merge pull request #9 from khempenius/master

(Incomplete) 'Pencil' icon added, but timeline needs to be reformatted