Working on the video
Stashing the live version
Still doing it
so what
Merge branch 'master' of https://github.com/nicholasjgreen/wip
Merge branch 'master' of https://github.com/nicholasjgreen/wip
Merge branch 'master' of https://github.com/nicholasjgreen/wip
Merge branch 'master' of https://github.com/nicholasjgreen/wip

Conflicts:
	cms/sites/default/files/styles/full/public/value_love.png
	cms/sites/default/files/styles/full/public/value_people.png
	cms/sites/default/files/styles/full/public/value_w.png
	cms/sites/default/files/styles/thumbnail/public/value_love.png
	cms/sites/default/files/styles/thumbnail/public/value_people.png
	cms/sites/default/files/styles/thumbnail/public/value_w.png
	cms/sites/default/files/value_love.png
	cms/sites/default/files/value_people.png
	cms/sites/default/files/value_w.png
ok
Merge branch 'master' of https://github.com/nicholasjgreen/wip
Video player
Merge branch 'master' of https://github.com/nicholasjgreen/wip