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

Conflicts:
	app/logs/dev.log
Merge branch 'yoyoyohamapi-master'