readme
fixed conflict
added video controller
fixed conflict