Added new resource Videos
Fixed merge conflict. Had to comment out validates_format_of :twitter_handle lines because of twitter authentication conflicts. Will fix later.