Stupid version change
Merge branch 'master' of https://github.com/codemariner/cambio

Conflicts:
	package.json
Merge branch 'production'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev' into production
Change from video to videos