Merge pull request #6 from yoyoyohamapi/master

frontpage 80%
11
Merge branch 'master' of https://github.com/yoyoyohamapi/RenaissanceVideo into yoyoyohamapi-master

Conflicts:
	app/logs/dev.log
Merge branch 'yoyoyohamapi-master'
eee
Merge pull request #8 from yoyoyohamapi/master

video preview
lsacomit
regenerate token