Merge branch 'master' of https://github.com/Make-Magazine/makercon into staging

Pull from master
Merge branch 'staging' of https://github.com/Make-Magazine/makercon into staging

Sync'd from Origin
Added Video icon
Added Video icon.png
Changed video icon to red + spacing
Merge pull request #13 from Make-Magazine/staging

Staging